Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Syndicate Uplink Items #175

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

SomeCabbage
Copy link
Contributor

@SomeCabbage SomeCabbage commented Jun 15, 2023

Description

The syndicate have decided to develop some specialized tools for traitors of specific jobs. These items are now available to purchase in the uplink.
Briefcase machine gun and magazines for the lawyer: 10tc and 1-2tc per magazine.
Gorilla cube Device for the chef: 8tc
Mk.45C magnum handgun: 8tc and 3 per magazine.
Exploding Plushie: 3tc

Changelog

🆑 SomeCabbage

  • add: Thanks to new developments in Cybersun's weapons research, the syndicate uplink is offering a few new items for agents and an exclusive item for lawyers and chefs each.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Jun 15, 2023
@github-actions
Copy link

github-actions bot commented Jun 15, 2023

RSI Diff Bot; head commit d2a444c merging into b46cc1e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi

State Old New Status
gorillacube Added

Edit: diff updated after d2a444c

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll let @Pspritechologist check the TC costs

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:(

Copy link
Contributor Author

@SomeCabbage SomeCabbage Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I wanna keep it but until money actually has a practical use for other people besides cargo it's probably gonna stay commented out

Resources/Prototypes/SimpleStation14/tags.yml Outdated Show resolved Hide resolved
Comment on lines 10 to 11
# - id: SpaceCash10000
# amount: 2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It being filled with two things is lame >:P
Needs to be like 50 500s. But also fills need a way to do more than one of an entity without doing it by fuckin adding it 50 times

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I suppose I could change it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't even need to look at how Upstreams do it- these need to be sorted much better. Please organize the ones the are for specific jobs.

parent: BaseItem
id: SentientGorillaCube
name: Sentient Gorilla Cube
description: A tiny teleportation device. After activation, once a syndicate-brand sentient gorilla is ready to take on the mission of assisting you, they will be teleported in to the device's location.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only a teleportation device? 🥺

@DEATHB4DEFEAT
Copy link
Member

@Pspritechologist why are you reviewing one by one o.o

netsync: false
- type: GhostRole
name: Syndicate Gorilla
description: Someone needs reinforcements. You, the first gorilla the syndicate could find and upgrade, will help them.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: Someone needs reinforcements. You, the first gorilla the syndicate could find and upgrade, will help them.
description: Someone needs reinforcements. You, the first gorilla the syndicate could find, upgrade, and dehydrate will help them.

🥺?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah whatever I'll just make it that and have the gorilla be a ghost role

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but see like the thing is is that I dont want the gorrila to spawn unless it can be useful

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont want the agent to just have an indefinitely AI controlled gorilla

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to leave as is. Maybe it just takes a while to hydrate. You could give it an active sprite for when it's awaiting a mind, like it sweating

Copy link
Contributor Author

@SomeCabbage SomeCabbage Jun 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yea! A sprite change for when after it's activated

Comment on lines +31 to +56

- type: entity
parent: PlushieNuke
id: PlushieNukeBomb
name: nukie plushie
suffix: Exploding
description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious.
components:
- type: EmitSoundOnUse
handle: false
- type: OnUseTimerTrigger
delay: 3.5
examinable: false
beepSound:
path: "/Audio/Effects/beep1.ogg"
params:
volume: 2
initialBeepDelay: 1
beepInterval: 1
- type: Explosive
explosionType: Default
maxIntensity: 8
intensitySlope: 3
totalIntensity: 65
canCreateVacuum: false
- type: ExplodeOnTrigger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be in a Syndie folder? Organization gets a bit shaky there, but I'd likely lean towards separating it. @DEATHB4DEFEAT

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a fun toy, put it with the other Fun/toys.ymls :)

Comment on lines +23 to +74
- type: entity
parent: BaseStorageItem
id: BriefcaseBrownSMG
name: brown briefcase
suffix: Rifle
description: A handy briefcase.
components:
- type: Sprite
sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
state: icon
- type: Item
sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
size: 30
- type: Storage
capacity: 30
- type: AmmoCounter
- type: Gun
minAngle: 16
maxAngle: 20
fireRate: 5
selectedMode: FullAuto
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/smg.ogg
- type: ChamberMagazineAmmoProvider
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineCaselessRifleShort
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineCaselessRifle
gun_chamber:
name: Chamber
startingItem: CartridgeCaselessRifle
priority: 1
whitelist:
tags:
- CartridgeCaselessRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: DynamicPrice
price: 500
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto for this as the plushie?

@Pspritechologist
Copy link
Member

@Pspritechologist why are you reviewing one by one o.o

Dunno, I did it with the first couple and didn't feel like restarting

@DEATHB4DEFEAT

This comment was marked as off-topic.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 27, 2023
@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@@ -27,7 +27,7 @@
name: Mk.45C
parent: BaseWeaponPistol
id: WeaponPistolMk45C
description: "Incredibly Robust 'Sidearm'. Good against most anything. Certified Anti-Clown Device"
description: "Incredibly robust 'sidearm'. Good against most anything, and a certified anti-clown device."

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: "Incredibly robust 'sidearm'. Good against most anything, and a certified anti-clown device."
description: "Incredibly robust 'sidearm'. Good against most anything; a certified anti-clown device."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants